6r should be possible, but I don't know if it can be faster. Sadly I won't have much time to investigate, so this 90 minute effort has to be enough for me.

EDIT: Just some area shaves, couldn't get rid of the inefficiencies.